Revision: baz--resolve--1.2--patch-18
Archive: jblack@gnuarch.org--2004
Creator: James Blackwell <jblack@canonical.com>
Date: Sun Feb  6 05:58:56 EST 2005
Standard-date: 2005-02-06 10:58:56 GMT
Modified-files: libarch/apply-changeset.c
    libarch/conflict-handling.c
New-patches: jblack@gnuarch.org--2004/baz--resolve--1.2--patch-18
Summary: conflict handling now correctly deals with adding more conflict files
Keywords: 

